From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 8 Jun 2011 21:44:48 +0000 (-0700)
Subject: * image.c (gif_load): Rename local to avoid shadowing.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3446^2~59
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d1c912c3d2bdb4becd8f71f0a7d19f341c116bc5;p=emacs.git

* image.c (gif_load): Rename local to avoid shadowing.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 3db22abaf02..f6dba56cfdd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-06-08  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* image.c (gif_load): Rename local to avoid shadowing.
+
 	* lisp.h (SAFE_ALLOCA_LISP): Check for integer overflow.
 	(struct Lisp_Save_Value): Use ptrdiff_t, not int, for 'integer' member.
 	* alloc.c (make_save_value): Integer argument is now of type
diff --git a/src/image.c b/src/image.c
index cdf05c78764..31b3f01c17d 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7146,12 +7146,12 @@ gif_load (struct frame *f, struct image *img)
 
   /* Which sub-image are we to display?  */
   {
-    Lisp_Object index = image_spec_value (img->spec, QCindex, NULL);
-    idx = INTEGERP (index) ? XFASTINT (index) : 0;
+    Lisp_Object image_number = image_spec_value (img->spec, QCindex, NULL);
+    idx = INTEGERP (image_number) ? XFASTINT (image_number) : 0;
     if (idx < 0 || idx >= gif->ImageCount)
       {
 	image_error ("Invalid image number `%s' in image `%s'",
-		     index, img->spec);
+		     image_number, img->spec);
 	fn_DGifCloseFile (gif);
 	return 0;
       }